use Distribution node by zeitlinger · Pull Request #15822 · open-telemetry/opentelemetry-java-instrumentation

zeitlinger · 2026-01-10T10:56:02Z

Fixes #15796

zeitlinger · 2026-01-15T11:55:30Z

@trask please have a look

zeitlinger · 2026-01-23T09:04:55Z

@trask please have another look

zeitlinger · 2026-01-24T14:03:36Z

@trask please check again

jack-berg · 2026-02-05T16:46:00Z

Blocked by #16087

zeitlinger · 2026-02-13T16:21:56Z

Punted runtime telemetry related changes to unblock this PR by not needing #16087

Addressed in latest commit:

EnabledInstrumentations removed (comment, comment, comment): Removed the EnabledInstrumentations interface entirely. InstrumentationPropertyEnabled and LogbackAppenderInstaller now call EarlyConfig.isInstrumentationEnabled() directly. AgentDistributionConfig exposes isInstrumentationEnabled() helpers directly without needing the abstraction.
RuntimeMetricsConfigUtil simplified (comment, comment): No longer passes EnabledInstrumentations — takes boolean defaultEnabled instead. The distro-level decision is made in the caller (javaagent installer or Spring auto-config), not in the library instrumentation.
AgentConfig removed: Replaced AgentConfig.instrumentationMode() with AgentDistributionConfig.get().isInstrumentationDefaultEnabled() in all runtime telemetry and oshi installers. No more string-based "default"/"none" comparison.

zeitlinger · 2026-02-17T11:44:43Z

@trask hope it makes sense now 😄

…based instrumentation matching - Replace FAIL_ON_UNKNOWN_PROPERTIES with DeserializationProblemHandler that logs warnings for unknown distribution.javaagent properties - Revert isInstrumentationEnabled to single-loop order-based matching (first name wins), consistent with ConfigProperties behavior Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

…ingle-arg overload - Initialize INSTANCE to null, throw on early access or double-init - Add isInstrumentationEnabled(String) overload using default enabled - Update comments to "Only used by tests" Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

During Gradle byteBuddyJava builds, InstrumentationModule subclasses are loaded which triggers AgentDistributionConfig.get() before set() is called. Instead of always throwing, return defaults when outside agent context. AgentInstaller calls expectInitialization() early in bootstrap so that get() still throws at runtime if set() was missed (catches ordering bugs). Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

…fig has no distribution node When declarative config is used but the YAML has no distribution.javaagent node, JavaagentDistributionAccessCustomizerProvider never calls set(). Add setIfAbsent() fallback in OpenTelemetryInstaller to handle this case. Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

…efault config in customizer provider Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

Environment.getProperty(key, List.class) does not reassemble indexed properties (e.g. enabled[0]=spring_web). Switch to Spring Boot's Binder API which handles both indexed and comma-separated list formats. Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

# Conflicts: # declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java

Copilot

Pull request overview

Updates declarative configuration to use the distribution node (e.g., distribution.javaagent.instrumentation) for enabling/disabling instrumentations, aligning javaagent and Spring starter behavior with the configuration model described in #15796.

Changes:

Introduce AgentDistributionConfig and wiring to read distribution.javaagent from declarative config (or fall back to ConfigProperties for non-declarative config).
Migrate javaagent and Spring starter “default enabled / enabled / disabled” logic from legacy nodes to distribution.*.
Update smoke tests, Spring starter tests, and add a dedicated javaagent distribution-config test suite + fixture YAML.

Reviewed changes

Copilot reviewed 33 out of 33 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
smoke-tests/src/test/resources/declarative-config.yaml	Switch smoke-test declarative config from legacy instrumentation node to `distribution.javaagent.instrumentation`.
smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java	Update test comment to reflect `default_enabled=false` behavior.
javaagent-tooling/src/testDistributionConfig/resources/distribution-config.yaml	Add fixture YAML covering `distribution.javaagent` properties (indy, excludes, instrumentation lists).
javaagent-tooling/src/testDistributionConfig/java/io/opentelemetry/javaagent/extension/instrumentation/internal/AgentDistributionConfigTest.java	New tests asserting `distribution.javaagent` parsing and instrumentation enable/disable semantics.
javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstallerTest.java	Update tests to use `AgentDistributionConfig` instead of GlobalOpenTelemetry/declarative config bridge.
javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/OtlpProtocolPropertiesSupplierTest.java	Reset `AgentDistributionConfig` in test lifecycle to avoid global state leakage across tests.
javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java	Reset `AgentDistributionConfig` in test lifecycle.
javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.java	Reset `AgentDistributionConfig` in test lifecycle.
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java	Use `AgentDistributionConfig` for module enable/disable decisions; remove legacy helper.
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassesConfigurer.java	Source excluded classes from `AgentDistributionConfig` instead of declarative config API.
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/UserExcludedClassLoadersConfigurer.java	Source excluded classloaders from `AgentDistributionConfig` instead of declarative config API.
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java	Replace declarative-config-based test toggle with a direct system property toggle.
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/JavaagentDistributionAccessCustomizerProvider.java	New customizer provider that reads `distribution.javaagent` and initializes `AgentDistributionConfig`.
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/AgentConfig.java	Remove legacy `instrumentation_mode` accessor tied to deprecated config shape.
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java	Initialize `AgentDistributionConfig` from `ConfigProperties` for non-declarative config usage.
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java	Use `AgentDistributionConfig` for force-synchronous-agent-listeners decision.
javaagent-tooling/build.gradle.kts	Add jackson-databind runtime dependency + add `testDistributionConfig` suite and wire into `check`.
javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/internal/AgentDistributionConfig.java	New internal holder for `distribution.javaagent` config (indy, excludes, instrumentation lists, defaults).
javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule.java	Drive defaults and indy enablement from `AgentDistributionConfig` instead of legacy declarative config nodes.
javaagent-extension-api/build.gradle.kts	Add compileOnly dependency for jackson annotations used by `AgentDistributionConfig`.
instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/DeclarativeConfigTest.java	Update Spring starter declarative-config tests to use `otel.distribution.spring_starter.instrumentation.*`.
instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java8RuntimeMetricsAutoConfiguration.java	Remove legacy spring_starter instrumentation_mode parsing; rely on enablement condition + runtime_telemetry config.
instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java17RuntimeMetricsAutoConfiguration.java	Same as Java8 variant: remove legacy mode parsing and use new defaultEnabled boolean contract.
instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/EarlyConfig.java	Implement Spring starter distribution-based enable/disable (lists + default_enabled) with Binder list binding.
instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/RuntimeMetricsConfigUtil.java	Change configure signature to accept boolean defaultEnabled instead of instrumentationMode string.
instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java8/Java8RuntimeMetricsInstaller.java	Pass distribution default enablement into runtime metrics config util.
instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/RuntimeMetricsConfigUtil.java	Same signature change: boolean defaultEnabled.
instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/Java17RuntimeMetricsInstaller.java	Pass distribution default enablement into runtime metrics config util.
instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java	Switch enablement check to `AgentDistributionConfig` instead of declarative config + legacy mode.
declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java	Remove tests that depended on legacy agent/mode mapping behavior.
declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigPropertiesTest.java	Remove tests for legacy agent prefix + instrumentation_mode string mapping.
declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java	Adjust node traversal to use `get()` instead of `getStructured(..., empty())`.
declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java	Remove special mappings for legacy agent/spring_starter instrumentation_mode and agent prefix translation.

trask

thanks @zeitlinger!

zeitlinger self-assigned this Jan 10, 2026

zeitlinger added this to Declarative Configuration: Java Jan 10, 2026

github-actions Bot added the test native This label can be applied to PRs to trigger them to run native tests label Jan 10, 2026

zeitlinger force-pushed the distribution-node branch from f669081 to 1cc82bd Compare January 10, 2026 10:59

zeitlinger moved this to In Progress in Declarative Configuration: Java Jan 12, 2026

zeitlinger mentioned this pull request Jan 12, 2026

change module names to snake case #15845

Closed

zeitlinger force-pushed the distribution-node branch from cc8ad84 to 928601b Compare January 12, 2026 14:49

zeitlinger marked this pull request as ready for review January 12, 2026 16:09

zeitlinger requested a review from a team as a code owner January 12, 2026 16:09

zeitlinger moved this from In Progress to Awaiting Review in Declarative Configuration: Java Jan 12, 2026

zeitlinger force-pushed the distribution-node branch from 7429911 to baa68af Compare January 13, 2026 07:05

zeitlinger mentioned this pull request Jan 14, 2026

Remove declarative config bridge from agent #15778

Merged

zeitlinger force-pushed the distribution-node branch from 4df8a96 to 4ffc8d5 Compare January 14, 2026 09:21

zeitlinger mentioned this pull request Jan 14, 2026

Added support for distribution config in ConfigProvider open-telemetry/opentelemetry-specification#4800

Closed

5 tasks

trask reviewed Jan 19, 2026

View reviewed changes

Comment thread ...io/opentelemetry/javaagent/tooling/config/JavaagentDistributionAccessCustomizerProvider.java Outdated

trask reviewed Jan 19, 2026

View reviewed changes

Comment thread ...a/io/opentelemetry/javaagent/extension/instrumentation/internal/AgentDistributionConfig.java Outdated

zeitlinger force-pushed the distribution-node branch 2 times, most recently from ac6a83f to 62c977d Compare January 22, 2026 10:47

zeitlinger mentioned this pull request Jan 22, 2026

add thread details for declarative config #15209

Open

trask reviewed Jan 22, 2026

View reviewed changes

trask reviewed Jan 23, 2026

View reviewed changes

zeitlinger mentioned this pull request Feb 6, 2026

Unify runtime-telemetry modules #16087

Merged

trask reviewed Feb 12, 2026

View reviewed changes

Comment thread ...ntelemetry/instrumentation/spring/autoconfigure/internal/InstrumentationPropertyEnabled.java Outdated

trask reviewed Feb 13, 2026

View reviewed changes

trask reviewed Feb 18, 2026

View reviewed changes

zeitlinger added 4 commits February 19, 2026 18:41

Fix spotless formatting

b763bc5

Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

zeitlinger force-pushed the distribution-node branch from 38b661a to b763bc5 Compare February 20, 2026 13:59

zeitlinger added 3 commits February 20, 2026 16:05

Reset AgentDistributionConfig between tests to fix CI failures

37ccaab

Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

Merge branch 'main' into distribution-node

2430fd0

trask reviewed Feb 20, 2026

View reviewed changes

zeitlinger and others added 3 commits February 20, 2026 19:48

Address review: catch IllegalArgumentException in convertValue, set d…

d6baa96

…efault config in customizer provider Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

feedback

17b2e9c

trask force-pushed the distribution-node branch from 73bd849 to 17b2e9c Compare February 20, 2026 22:53

trask added 7 commits February 23, 2026 10:49

Merge remote-tracking branch 'upstream/main' into distribution-node

b088e9a

# Conflicts: # declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java

no longer needed

ba5ac4e

remove unnecessary TreeSet

1a6f44d

spotless

50b5d6b

comment

d8c09d0

extract method

1f5b004

LinkedHashSet not needed

af0a6c4

trask requested a review from Copilot February 23, 2026 19:20

Copilot started reviewing on behalf of trask February 23, 2026 19:20 View session

Copilot AI reviewed Feb 23, 2026

View reviewed changes

Comment thread .../java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java

trask added 2 commits February 23, 2026 11:32

errorprone

f0098bf

updates

604004c

trask approved these changes Feb 23, 2026

View reviewed changes

trask merged commit 3c573ea into open-telemetry:main Feb 23, 2026
87 checks passed

github-project-automation Bot moved this from Awaiting Review to Done in Declarative Configuration: Java Feb 23, 2026

zeitlinger deleted the distribution-node branch February 24, 2026 05:37

Conversation

zeitlinger commented Jan 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zeitlinger commented Jan 15, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zeitlinger commented Jan 23, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zeitlinger commented Jan 24, 2026

Uh oh!

jack-berg commented Feb 5, 2026

Uh oh!

Uh oh!

zeitlinger commented Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zeitlinger commented Feb 17, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

trask left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

zeitlinger commented Jan 10, 2026 •

edited

Loading

zeitlinger commented Feb 13, 2026 •

edited

Loading